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