Merge changes from topic "b225401790" am: 6bdbd3017d

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

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