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

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

Change-Id: I8b6f8fbea58ff300ca58fb781883d24bc54024c4