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