Merge "Remove indicator theme for non-device entry activity" into tm-qpr-dev am: 85d56bea

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



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