Merge "Remove move dead code." am: acec0918e5 am: 1fc404900c

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1677028

Change-Id: I848c3fb85d3b63159faec3525e2befbee83f64f6