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

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

Change-Id: I3c257753e1a9edaba730c9d6f7c6f4c425439203