Merge "KeyCharacteristics implement Parcelable interface" am: 386ee11839 am: 468ddcb585
am: 26457f4315

Change-Id: I9bc8fdfe4a90858e28e5c64816fca474117fde21