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