Merge "Prevent cm from incrementing 0." am: abd9d6a2 am: b8bbe8e2

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2101750



Change-Id: Ic4f2889c414555dc35b1ef86914c7e3d1281d4f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>