Merge changes from topic "low_ram_multi_display" am: 355729e4a1

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

Change-Id: I5290b1da4b543f3de71b71428ce0f3cc0c6eb20f