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