Merge "Allow Android Auto to move to trusted." into tm-qpr-dev am: f267c377 am: 8dcab7cb

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



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