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

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



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