bff3cb288c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1616687 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I06708ad8febc8df30eb7dcc657f2b791e97a03e2