Merge "Add handover permission, fill in some missing API gaps." am: 1dfa830bb0 am: ed4dd9fbc6
am: 83a6df5b07  -s ours

Change-Id: Ia3d210776be49ae2654e74494d7a502d1b413daf