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

Change-Id: I93345cddc383837ffa71e1c13a793f74bda9ac3f