Merge "frameworks/opt/net/ims: Set LOCAL_SDK_VERSION where possible."
am: 5eb0bb5f30

Change-Id: Ia34ec813615b234331897cb07087fe5cb3c802c3