Merge "Non-module targets." am: 3f0139b119 am: 6dc0c9f780

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

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