[automerger skipped] Merge "MediaController2: Enable connecting to the MediaLibraryService2" into pi-preview1-androidx-dev
am: d5f18eb408  -s ours

Change-Id: I0569cbf35254de18dbfa1e471876bca2305f1b65