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

Change-Id: I6af2626ee814cfdfbdce68d7c7133c09011a6767