Merge "cleanup the isUpdatedSystemApp" am: f86cf6fb6c

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

Change-Id: I2815b83b72268d53b057f072d447b6688bb7d77e