Merge changes I82c49085,Ic2e461c1 am: cbae51899b

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

Change-Id: I8c45068dae3bde7c28c6fa21a7335c353e1b6def