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: f4b7d5e2 am: db11f633

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



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