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

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



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