Merge changes from topics "presubmit-am-248a5834b9dd4073b51b74054388fc3a",...

Merge changes from topics "presubmit-am-248a5834b9dd4073b51b74054388fc3a", "presubmit-am-574127843dcc4fc0a261446d5098d8a7", "presubmit-am-8b4c493759e1456584e0f66930a456f6" into sc-v2-dev-plus-aosp am: 404cbcb3

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/16687982

Change-Id: If851c350a4228065b1c646ca96d444f431936c91