372a2c302d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1532513 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iffa2479320dd97650460690652732b59d23c248c