Merge "Change argument of MediaSession2.Builder#setExtras() as @NonNull" into qt-dev
am: 1b92e90402

Change-Id: I54b19ea29e4ad728b9e3f85bc26668d406b2ccf0