Merge changes I10ab56a8,I7e437c3d,I0413c52f am: bece59741a am: 3979981b2d am: 70d4f9abc9

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

Change-Id: I87e9f3a8e69bb69ce6d67986bba92f7f0ac4e757