This reverts commit 5b11e0b49b.
Reason for revert: These changes were required to fix the -next release config on main branch which was pointing to Android U. Reverting this change as now -next points to Android V.
Change-Id: I5ceb8dc0489e74571389a9915e361607f44f0484