Merge "Remove unwanted separator bar when description is empty" into udc-dev am: 4d795645 am: cb75b75d am: 9021842f am: 8b9623e4

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



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