Merge changes If663677b,I387d90ea am: ea4a93a946

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

Change-Id: I59eb38410465eed276c5744d5373b4ef84656f37