Merge changes from topic "av_rtp_measure" into sc-dev am: e2a52b0c am: 5f20072f am: 63ddf095

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

Change-Id: I589128e5a9dee9bfad08a153a8a8487108fc12db