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

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

Change-Id: I986e476cfb549ebb6e37fc81f79722b42a98361f