Bug: 235717579 Test: package based on device-tests Change-Id: Id7e3d62dda7bd206677018a43b76524394d85052