Merge changes I5dcaabaa,I998cf688 am: 8dddad53d5

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

Change-Id: I3c22682e68f2d9a1eefbfdf6c673ede87c3aa89d