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

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

Change-Id: Ib2ca97c31413c757be5babb6d65f6875f08e84dd