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

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



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