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

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

Change-Id: I268aeb943901228a9d2317accc6b0b12df19c79c