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