[automerger skipped] Merge "Add a persistent key to overwrite MIN_CE_LEN for...
[automerger skipped] Merge "Add a persistent key to overwrite MIN_CE_LEN for Hearing Aids" into qt-dev
am: d407c585 -s ours
am skip reason: change_id I1c52b2f99235f8d88e0a1d278dbf3174f1c60709 with SHA1 704cc88c is in history
Change-Id: Ic59debfbedc9c10558e45a3ac56e9e0c8a67ae0c