Merge changes I7c17ab51,I5bd4acb4,I93270f00 am: 18bbac10c1 am: 68acc834d4 am: c04b6004a3

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

Change-Id: I59184b7d4a01b1478599b53b6f7dd1fc3b3c5465