Remove legacy behavior for pre-21 apps am: 93193a6a

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



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