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

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

Change-Id: Ia5c2da471ff323a05957eab9298b798aa57bf3c4