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 am: 638a70b7 am: 3c223f82

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



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