Merge changes Icc666e74,I523307bd am: 32278d1edf

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

Change-Id: Icfff1c29ae49fba3b9277d63e4c6234b6879e19a