Merge "Don't use framework and SDK at the same time" into tm-dev am:...

Merge "Don't use framework and SDK at the same time" into tm-dev am: 6166d7a7 am: d26b73fa am: 12037cd4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17583383



Change-Id: I684987477d012fd5627cf4b45a3eb90c620e7f9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>