Merge changes from topic "ota-tune-1" into main am: 160e4c3c am: 9e58ddbf am: 898c4ae1

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



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