Merge "Convert libmedialogservice to Android.bp" am: c2a068aa3b
am: 59f7e17988  -s ours

Change-Id: I6eaebeb2bd000788d10e6dd6628f96cebfac60d7