Merge "Fix "Automatically sync app data" button state not changed" into tm-dev am: b94c0ab4

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17397182



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