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

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

Change-Id: I4494e2a9f9e2fa7fce2ceea9daccb2e073936c07