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

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

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