Merge "MediaSession2: Clean up TODOs under frameworks/base" into pi-dev