Merge "Merge "Support restoring TileService before app install" into udc-dev...

Merge "Merge "Support restoring TileService before app install" into udc-dev am: 3937472d am: c30f98ad" into udc-d1-dev-plus-aosp am: 60659c21 am: 5e28e82e

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



Change-Id: I81ff9ac06dc7244515a687d282f8794c8f9f6e7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>