Merge changes from topic "b225401790" am: 6bdbd3017d am: f1f3c3571d am: 89b92c7be3 am: a3a3d3f749 am: 226423051f

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

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