This reverts commit 33b9bb815b.
Bug: 149802360
Reason for revert: Test is hopefully fixed
(cherry-picked from commit ac3eecfd8a)
Test: atest BootImageProfileTest
Merged-In: Ifc99b98d0b438f5c0d7ae29a9046c4fc5fe2cf21
Change-Id: Ifc99b98d0b438f5c0d7ae29a9046c4fc5fe2cf21
Test that the expected properties are set.
Test that saving the system server profile contains both the boot image
profile and system server profile.
The test requires root to run.
Bug: 139883463
Test: atest BootImageProfileTest
(cherry picked from commit f7849d916a)
Change-Id: Id7fa4ecc507864c2855da276025be076e5768df1
Merged-In: I6bb39337ba07be58b7dc2b314a8ee92154256f17