Merge changes I9731d978,I9e325782,I441a4d4d,I86a85e48,I9268fd66, ... am: aeb15e8592 am: 788f03de26 am: 365c77133b

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

Change-Id: If797faa86575774a6beeb1788e66ed6ae2d17994