Merge changes from topic "am-70381af1ffc5488eae2b942658dfabd3" into main am: bbc0bef481 -s ours

am skip reason: Merged-In I846cd2bbf1159abf05e9d754c2e96c12912c7d72 with SHA-1 31ec381052 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/3049053

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