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

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



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