Merge "Update condition to elevate a sync adapter to ACTIVE." into tm-dev am: 3afb3e19 am: 5db8abf7

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17665897



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