[automerger skipped] Merge "Add Feature Flag for Hearing Aid Profile" am: e4e653b8bf
am: 2350e15f4b  -s ours

Change-Id: Icda2f076515bcf48d03a3180d689d066f19d449c