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

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

Change-Id: Ic74d932075e32171c4006ae3c10bdf5c2a69215b