[automerger skipped] Merge "[DO NOT MERGE] Remove selection toolbar code from...

[automerger skipped] Merge "[DO NOT MERGE] Remove selection toolbar code from build time" into tm-dev am: 070275dc am: 80f42f51 am: dafb9ad1 am: b296fae1 -s ours

am skip reason: subject contains skip directive

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



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