Merge "Battery optimizations for proactive sync" into udc-mainline-prod am: 18b10465a6

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/providers/MediaProvider/+/25502135

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