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