Merge "Add null check for DeviceProductInfo" into rvc-dev am: 8fce9febad

Change-Id: I215a326fa26e0d471ca30d0503b9553e2a65e8c5
tree: 5a6c55661ef1be6bd0aef7b28dddba4aa8740c41
  1. api/
  2. java/
  3. Android.bp