Merge changes I69174120,I1ab2874d,Ia76baa17 am: 0bddd4a554

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

Change-Id: Ie3d67eea6830868206bf518043b57ce4eddab27c