Dialer: Target current SDK

Since compiler complained about multiple declarations and it's not
worth figuring out the duplicate definitions, just merge the manifests
into one

Change-Id: I1f9ad46d65144fc1cbbceacfdf4adf089e7e4a03
87 files changed