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

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

Change-Id: Ie9fca87869811a392b1461fc3b10c965bbfa7d9f