Merge changes I1ceccedd,Ide2c7302 am: c70a7d6258 am: 788f94aff2 am: 2c8a5fd13c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaa8272005503a3b984a943bd62c5a522d5f14bb1