This reverts commit c6cf9e3f. Reason for revert: unrelated to the bug Test: atest ActivityRecordTests Change-Id: Iaa9f06102eabf4399401c73bd126a92549cd7acd