Merge changes I9eed58b2,Ie83c5ee3 am: 047585ed am: d37883f6 am: bd173446

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



Change-Id: I785255d5d66e5e0e1b257a7ba8c1ae5c3b10845c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>