Merge changes I06ab0f2d,I8b146aa1 am: 67ba0bc206 am: c4432db9e9 am: 5a00e3af70

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I75c940363940f4c941cc7dc89452bed078396a7e