Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2221103 Change-Id: Ibe39f658c83b414b227c747e1d2fd80e44c88a2b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>