[automerger skipped] Merge "Expose hidden resources used in telephony/common" am: 4481815101 am: c1e69dc9f8 -s ours
am skip reason: Change-Id Iff28c13e3470ea9b2e03cba33bf9489a089f8add with SHA-1 a63e69cf94 is in history

Change-Id: I6894dc42a7f1d5d3d75db73d5ea382ee4a2edcff