Merge "Open Mobile API for frameworks/base" am: 183865f3e1
am: ab8328c047

Change-Id: I55279ea7f83de285df54f7a01257230268c253f0