Merge "Update the Android.bp file for radio/1.1/types.hal" am: c8def011cf
am: a130eb33bd

Change-Id: I27ed6f434c6a803ad363cb1bbd8fee8092acbb04