Merge "Remove selection toolbar code from build time" into udc-qpr-dev am: 65ffe495

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



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