Merge "Add string ids to the result bundle for parental consent." into...

Merge "Add string ids to the result bundle for parental consent." into sc-qpr1-dev am: 63786513 am: 3452769f am: 184e77a8

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

Change-Id: Ic7cae7f02aaaa7e36222a0b4bbad9ae0a67fbe01