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