Merge "Revert "Move frameworks/base/Android.mk to build/tasks"" into main am:...

Merge "Revert "Move frameworks/base/Android.mk to build/tasks"" into main am: 3ac66146 am: 8a65d662

Original change: https://android-review.googlesource.com/c/platform/build/+/2990390



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