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

Change-Id: Ia61cbbe635e5c9cfdac7304e3c47678de254b42d