Merge changes I7c17ab51,I5bd4acb4,I93270f00 am: 18bbac10c1

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1470088

Change-Id: Ia71e6036162249dd05f16deffc29b0b8f75ceab7