Merge changes I67e5fa23,I223b207c am: 32f5d14cef am: 4dc9bb97c4 am: 818c1642be

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

Change-Id: I7acb1ccf4ff3d3d16863c08e1fee407b69427d54