Merge "Do not update enabled state when app ops is not changed" into tm-dev...

Merge "Do not update enabled state when app ops is not changed" into tm-dev am: 8d4ecda1 am: a70da224

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



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