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