Merge changes I25b3f807,Iaa13a92d into sc-v2-dev am: e6adce5936 am: c59df4b3f1

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

Change-Id: I27941d9084fad3398f4b8641b7b40aa449aa94a1