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

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

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