[automerger skipped] Merge "Remove selection toolbar code from build time"...

[automerger skipped] Merge "Remove selection toolbar code from build time" into udc-qpr-dev am: 65ffe495 am: 3e4a62e7 -s ours

am skip reason: Merged-In I2bca3af4220ee13def11e85a60d901d58b306a1a with SHA-1 cc8461dd is already in history

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



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