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

Change-Id: Icc1e3f57d9ec5ec1922c49df224dcec3b86b65c5