Merge changes I05b83c47,I5a840ec1 am: 49c52755d2

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

Change-Id: I56b9faab494eacdcbfd6ca0df1b6684d7ee69d4f