Merge "MediaSession2: Clean up TODOs under frameworks/base" into pi-dev am: 16ac9b680a
am: b528587073

Change-Id: I7c4f64b1e46c3389eccd835b10750fef5d4a1fb1