Merge changes from topic "b225401790" am: 6bdbd3017d am: f1f3c3571d

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

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