[automerger skipped] Merge "RESTRICT AUTOMERGE Show primary bouncer on...

[automerger skipped] Merge "RESTRICT AUTOMERGE Show primary bouncer on TOUCH_OUTSIDE" into tm-qpr-dev am: dcdc6fbc am: a2424bea -s ours am: c7a98a95 -s ours am: a4928b9d -s ours

am skip reason: subject contains skip directive

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



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