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