Merge "hardwareinfo: Hide hardware revision if empty" am: a1716edbb6 am: defe0a6b9f

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia74c0bea83aa76c4b8aa453a190bebe8041eafed