Revert submission

Reason for revert: Behavior incompatible with Pixels 3 and 3a on VZW

Change-Id: Icbd3edf4dc3e7d934776973d724e8a6da410462a
2 files changed