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

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

Change-Id: Ibc955b6f3d338ff6faf7841a8a6eb56a3f5c39b4