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

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

Change-Id: I141384774f55dec9cf72ebc3fd4710766999d4d5