Merge changes I3eb82680,I9d6147d9 am: bbd9fb5c27 am: c27bf45cb6

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8a111bb928c5afd2cbbb15db503b60ef501ff2e0