Partially revert "Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/apps/InCallUI into cm-13.0"

This reverts commit db0bbb801fe6e693c11d13701d8a1631a2538ff5, reversing
changes made to 34d0d9380d564490433df40ec4afd3ef461545c2.

Change-Id: Ib09caaf0b217ba6065b683991e03b9feb5666dee
77 files changed
tree: d11c6bd90df063cc717a7c576c88867bd0bfafa2
  1. res/
  2. src/
  3. tests/
  4. .gitreview
  5. proguard.flags