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

[automerger skipped] [DO NOT MERGE] Revert "Revert "[DO NOT MERGE] Remove selection toolbar code from build time"" am: 8be17739 am: 62d698f8 -s ours

am skip reason: subject contains skip directive

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



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