Merge changes If02a3990,I92106608 am: 2b31e17d15

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

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