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

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



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