[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 skip reason: subject contains skip directive

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



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