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