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

Change-Id: Iee488feed404819e487f3ae87b3e71f531fe69a4