Merge changes I335e82e2,I84ba363d,I8f18083b,I854a952d,I00e23441 am: bf97a3ab5e

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

Change-Id: I641df2f25ba989af597952a03488c817c82323c2