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: cb75b75d am: 6a0b3e81 am: 44c2a9d8

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



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