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

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



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