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

[automerger skipped] [pm] fix SCAN_AS_STOPPED_SYSTEM_APP for restoreDisabledSystemPackage am: 90451b71 am: 74d545bb am: f8adf3cf -s ours am: dd2b5aa2 -s ours

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

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



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