Merge "Provide a valid ComponentName for testing Parental Controls" into tm-dev am: b27e2119 am: fd79cd39 am: 35d0052b

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



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