Remove primary SHIFT variables from ADataSpace

Bug: 201539996
Test: build pass
Change-Id: I91b65470567d243213cf7e1dbabec5ff41130371
2 files changed