Merge "Hide description text view if there is overlap." into udc-dev am: 1eb3724e am: dd373e10

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162325



Change-Id: Icffc3a12145527dcb8c9873719c1c4a3adc8f1f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>