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