Merge "Dismiss PackageInstallerActivity when SimpleErrorDialog cancelled" into sc-dev am: 949d11e69f

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

Change-Id: Ibabe42fb4b5a274b2c73022287174ff3ce6af276