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: f1259a6f am: 5389645e am: 1ef14513

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



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