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

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

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