[automerger skipped] Merge "Merge "Fix PackageSetting isUpdatedSystemApp and...

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

Change-Id: Ie4bde6175b21041c06b3bfb781526a445f1645d5