Merge "Add persistent state for Hearing Aid Profile" am: 2282e2f57f am: 0f9b8c2c60
am: 08d6f6a60a  -s ours

Change-Id: Ibbd740ca67bf73b7418aae1d277c3a99cd08327b