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

[automerger skipped] Revert "[DO NOT MERGE] Remove selection toolbar code from build time" am: 888e79f7 am: c4d1b9e6 -s ours

am skip reason: subject contains skip directive

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



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