[automerger skipped] Merge "[DO NOT MERGE] Revert "Revert "[DO NOT MERGE]...

[automerger skipped] Merge "[DO NOT MERGE] Revert "Revert "[DO NOT MERGE] Remove selection toolbar code from build time""" into tm-qpr-dev am: 990b2f26 am: 2450c600 -s ours

am skip reason: subject contains skip directive

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



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