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