[automerger skipped] Merge "DO NOT MERGE Remove explicit indicator flag from...

[automerger skipped] Merge "DO NOT MERGE Remove explicit indicator flag from teamfood." into tm-qpr-dev am: 2438409e am: dee8718a -s ours am: 9ab308c6 -s ours am: 7d5175b1 -s ours

am skip reason: subject contains skip directive

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



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