HIDL Return withDefault const am: faad16dded am: 0844dad16c

Original change: https://android-review.googlesource.com/c/platform/system/libhidl/+/1866758

Change-Id: I85c28690763df729aa53740fe3d99f7996d9109b