Merge changes from topics "presubmit-am-214145db4e844a3eb48591b1c0509214", "presubmit-am-3a1f20c9e6e541a792659ad737cc2c1b", "presubmit-am-773507dbe99d46c99c53774424df1c86", "presubmit-am-866809b756fb43e8b4c9d863ec412de1", "presubmit-am-8d4eeaa94f5944d0bd5da79aeb6697cf", "presubmit-am-b4831d72c2fe4b6d92d3cc772dad20d5", "presubmit-am-ce68d263d53d49bf89a4507f8b6b2165" into tm-dev am: 6a85800efb

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

Change-Id: Ifaf872ceff70c5f475690e4bbe3d3b2fc53778d5