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