Merge "Fix test cases failed in WinscopeTraceTest" into udc-dev am: 8155b72cf8
am: 386b3b662b
am: 4637c3fd95
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22898012 Change-Id: I768738946b48ac2774923ca522e8b94fea441e06 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: