Merge "Add health storage HAL test configs" am: c51a6a87b7
am: 56129d6a43

Change-Id: Ib6774a9e4833f6758d4da17d974b21ba7045409c