Merge "Fix flickering in USB page" into sc-dev am: f10ecb43d1
am: e0e7d99217
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14732236 Change-Id: I1ee4596c709a74239098b0d416504a1aa349018e
This commit is contained in: