Merge "Remove unwanted separator bar when description is empty" into udc-dev...

Merge "Remove unwanted separator bar when description is empty" into udc-dev am: 4d795645 am: 384a2c4c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23047053



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