This reverts commit ef4447e281.
Reason for revert: change only affects aosp_lynx-userdebug, test pass with the broken test: FrameworksServicesTests:com.android.server.pm.PackageManagerTests#testSigSameAfterUpgrade
Bug: 253288064
Change-Id: I7285439a6138723bdda037ae5238105c2dd7a1a3
DroidMonitor: Potential culprit for Bug 254323087 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
This reverts commit b9cb6d340b.
Reason for revert: Multiple test failures on multiple targets.
Change-Id: Icf83fcb9a56349adf78638509ac755db7440c660
based on panther 0e0ae4dd4045e00dd50826d5c411351d47949d92
No-Typo-Check: based on above commit
Bug: 202250383
Change-Id: I7dbcba9fc0644cf8e547c59b14a544701adc484b