Merge "Convert libmedialogservice to Android.bp" into oc-mr1-dev-plus-aosp