Merge changes I01ffdde2,Iecab1226 am: a5786a15e1

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1696089

Change-Id: If24eabfdfa80b036b541c4d3e1bf8064fe80f213