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

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

am skip reason: subject contains skip directive

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



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