Merge "libmediametrics and libmediametricsservice: Updated Android.bp" am: fe4094eace

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

Change-Id: I10815c01bae15ea4351f753159ced020db0377ed