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