Merge changes from topic "b/167709539" am: ad688d3e8c am: 7d360a08a0

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib162f0d936d4876987dbc2beceb570955bd9530d