Merge "Merge "Double tap to expand PiP." into oc-mr1-dev am: 2a6f25b995" into oc-mr1-dev-plus-aosp
am: aa960edb78

Change-Id: Idbf3444e2a823357421faeeadd3b97a3ae5e149d