Merge "[DO NOT MERGE] Remove selection toolbar code from build time" into tm-dev am: 070275dc

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



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