Merge cherrypicks of [17591709, 18766114] into sc-platform-release. am: 8455185d1c

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

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