Merge "Remove move dead code." am: acec0918e5

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

Change-Id: I87daacd3eb5f510aa2beb461e277fd5984d8978f