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

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

Change-Id: Ie6d5c997e770718baf3db6d16eb187c33ddf8b51