Merge changes I31ddbed9,I702a2449 am: a730b44c86

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

Change-Id: I490ac9074ecbf513b111108a8835e700d03af1fb