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