Merge "Set up correct ComponentName for test mode of Parental Controls" into tm-dev am: d191a16c54 am: 8ef0f87dcc

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17504393

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