Merge changes I69174120,I1ab2874d,Ia76baa17 am: 0bddd4a554 am: 8fb60b5c91

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

Change-Id: Ic78e48c089bf3bab344dc51206b00b30f84ebc7a