Merge "ahat-tests: Use LOCAL_TEST_CONFIG to set test config"
am: e42e870e89

Change-Id: I26839453365313730ae578118766c957c93a8709