Revert "DO NOT MERGE test if b/65484460 is fixed."

This reverts commit 08434c07d24ad5f27d9d49476b1c2f97a2d1a62f.
Bug: 65484460
Bug: 114103143
Bug: 116174409
Reason for revert: Test needs to be reworked

Change-Id: I20a53886b8a5722d320faf9140f7b6d2d8c07e7f
2 files changed