Merge changes from topic "am-43ae75bafd3e4f78a4972106e2689147" am: cc75335df6

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

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