Merge changes Icc666e74,I523307bd am: 32278d1edf am: 0e39c5cbcb am: a7aff0700f

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

Change-Id: Ic7e3012796a0f83f5f4f134f2bd6cfe051337c87