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