New Patch Level for android mainline

new android.bp file to define android-mainline patch level
xml to define the patch level 2.

Bug: 433787201
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:fa11a4437b6a5d41d503fac3763ed0d17e5adeff)
Merging the fixes for apexd outage to security branches.
Bug: 433787201
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:43dd1249f40c5f4cbe06e236ed376b34ba418f2f)
Merged-In: I5aa0ff17b60b82d16a1054055370524734c5fba2
Change-Id: I5aa0ff17b60b82d16a1054055370524734c5fba2