[automerger skipped] Merge "Merge "Fix PackageSetting isUpdatedSystemApp and SYSTEM_EXT rescan" into rvc-dev am: 1fd15d20 am: de7ba680 am: 7788b06d" into rvc-qpr-dev-plus-aosp am: e3b890ec -s ours
am skip reason: Change-Id I81d126efc144725cac8af6810d33952295b375e1 with SHA-1 8359e40c is in history

Change-Id: Ice752dfc878e0a632f810c05131117182cee5199