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

Merge "Non-module targets." am: 3f0139b1 am: 6dc0c9f7 am: 824f0624 am: 2cb1c268 am: 8297b1ed am: d82c7824

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



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