Merge changes I93f0760d,Ie40ec955,I59dbf3c5,Iaacd46a5 am: 75278fa5e7 am: ab2030c3a3

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

Change-Id: Icb2276797191f9ebbab2a27489e72f924e69f471