Merge changes If02a3990,I92106608 am: 2b31e17d15 am: 2e08a01c5b

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

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