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

Change-Id: I4120c6545d880e945be15f4e298b8eb31200aa74