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

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