Merge "Add persistent state for Hearing Aid Profile" am: 2282e2f57f
am: 0f9b8c2c60

Change-Id: I971ab43aed9d0f656e0878e7277ec8e416b1867f