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