[automerger skipped] [pm] fix SCAN_AS_STOPPED_SYSTEM_APP for...

[automerger skipped] [pm] fix SCAN_AS_STOPPED_SYSTEM_APP for restoreDisabledSystemPackage am: 90451b71 am: 66cdf111 -s ours

am skip reason: Merged-In Ic51a9ceb7db6d887cebc390bb2878db8810cddbf with SHA-1 c3415b9f is already in history

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



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