Merge changes I713bc2ec,Ib9ab07c9 am: 3795a7d1d2 am: d8b7ab2076 am: 2d6430198c am: 3827e8c95e am: 5a56405991
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1537264 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifac39d900d88ba9f0f3a7384bd40bb31e2171f08
This commit is contained in: