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: Ic2a4b0c8d13654a6c18125e5ee4f9a72a286522c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>