Merge "Fix CTS failed when publish device capabilities." am: 833b4a1ed4

Original change: https://android-review.googlesource.com/c/platform/cts/+/1649976

Change-Id: I06b915121aba9316cbb0865280bcc256755df360