Merge "Non-module targets." am: 3f0139b1 am: 6dc0c9f7 am: 824f0624

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



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