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

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

Change-Id: I7fb50216bcf983584f664a691321683dd79ae38d