tree a87d41f941e9e0d1697addded80ff168190d1a9b
parent 868980b4338e1ae9be24e746e2fbb9a325ce5441
parent c1f2dde2fc0b8fac459239ae993f2c0f4f084a7d
author Devin Moore <devinmoore@google.com> 1702342017 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1702342017 +0000

Merge changes from topic "HwNoService" into main am: c6832095d2 am: 9a06f0a772 am: c1f2dde2fc

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

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