[automerger skipped] Merge "Return non-null default values when RemoteException is thrown." into qt-qpr1-dev am: 002e6f8ac4 am: c77181bc68 -s ours
am skip reason: Change-Id Id308a870bf66bf2314241a8d2acdb6b8da052bf0 with SHA-1 049a1d5415 is in history

Change-Id: Ia31ecc165825b6021242c59c79451a5a89084989