Merge "Increase user-unlock timeout for ___UserContentResolverTest" into tm-dev am: 0c0fc66390 am: e2200486a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17060499 Change-Id: Iab9beae247a52b57a55fc7ad8dd9ed4c60582623
This commit is contained in: