Merge "cleanup the isUpdatedSystemApp" am: f86cf6fb6c am: 2635bb28b4 am: 9149eab591

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

Change-Id: Ia64761f215a5b353ff961d234994d613412d5d0d