Merge changes Ib0160fe1,Ib5a11b7c am: 09fe7d7b48 am: e0c446c7d2

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

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