Merge "Adds intent extra to package data clear broadcast during restore operation." into udc-qpr-dev am: 539f9a3470 am: 903ba87d04

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

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