[automerger skipped] Merge "Fully support dynamic ims device features" am:...
[automerger skipped] Merge "Fully support dynamic ims device features" am: 831d0ba3 am: e92de7b0 -s ours
am skip reason: Change-Id Ibae24f5026f27ea76ac1e2a7eea2b380c6014f48 with SHA-1 56b64fa4 is in history
Change-Id: I7111e0308847f10ca3a1f2affcce99c87047e498