Merge changes from topic "av_rtp_measure" into sc-dev am: e2a52b0c am: eec12404

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

Change-Id: I5e024063929d434415c8e6e03cd03e5ab69a8e5d