Merge changes Id3087199,I707cf4dd,I64e3d7fc,I4c9cdc63 am: 1ea3d5fc2e

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

Change-Id: Ib154e067238708973a19b60e307851947aaa423d