Merge "PictureInPicture: rm whitespace from build.gradle am: 3968102e am: 1fdb9d73 am: 14ceb12e" into oc-mr1-dev-plus-aosp