Merge "[DO NOT MERGE] Revert "Revert "[DO NOT MERGE] Remove selection toolbar...

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

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



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