Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1648807 Change-Id: Ic72516432967170799097df3ccb1875c5ce40df7