Merge changes I7648ff04,Ie8012b1c,I3e655277 am: b8a40de4f4 am: 17b0984538 am: 30c59a6afd

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1712603

Change-Id: I0e69c625ae14313f1af6a00f0f39c40820f73699