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

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

Change-Id: I86fa314d8a7631a0c768f8d2ab22bb1be68714d2