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

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

Change-Id: Idc5f5bb8378988eaafe8f1e20b448354490a69c3