Merge changes I22583380,I0b6c6650 am: e29b2c2e60 am: 287388ff28 am: 689fac3761 am: e17973b82d

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

Change-Id: I011eeabd86bc43fbbab225e500235b7d231434df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>