Remove comments to avoid merge conflict from aosp

This CL will be reverted as soon as the CL from aosp has merged.

Test: none
Bug: 261729059
Change-Id: I349d6cc86a9221491e0fe048f00164cd1f516a5d
1 file changed