Merge "Revert "[DO NOT MERGE] Remove selection toolbar code from build time""...

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

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



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