Merge "Fixes ManagedUserContentResolverTest for automotive." into sc-v2-dev am: 05f2b29c95

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

Change-Id: I0a4634899ecf9b8234aaf96a196c026dafb67091