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

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



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