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