Merge "Move testAlwaysRequireConsent to frameworks/base" into sc-dev am: 826df7ae78
am: a7d250d29b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14984752 Change-Id: I019bfce5e71a50f3d296841e0b5697d38da69265
This commit is contained in: