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

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

Change-Id: Ibaff558d727141a80baa88ed22e3a12b80bd7b0a