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

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

Change-Id: I6c122427df250c8c4db28258e077b38581cd75af