Merge changes from topics "presubmit-am-55f310f6061a4fdfa7811f47f62b8b5c",...

Merge changes from topics "presubmit-am-55f310f6061a4fdfa7811f47f62b8b5c", "presubmit-am-f6a0ce426c734db58ba765fa00f5f38c" into tm-dev am: 3356367c am: 3124628d

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



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