Merge "Allow PipTouchHandler to re-enable the touches" into tm-qpr-dev am:...

Merge "Allow PipTouchHandler to re-enable the touches" into tm-qpr-dev am: 247ad78e am: d3f39b4e am: 225ffe7f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22211152



Change-Id: Ib027ce0a8e481f42ee8e128428e3b2eb9c8ef9f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>