Merge "Track elapsed time for 'waitStreamEnd' timeout" am: 0523f70556 am: 5e991e116d am: 246e03a01b am: bfc252c825

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1930618

Change-Id: I91564a9ca5ed6678a7671ed549017852f1061017