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

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

Change-Id: I982c604455e46bda94438c4078ee2413787aa8d4