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

Merge "Prevent cm from incrementing 0." am: abd9d6a2 am: b8bbe8e2 am: 694d5143 am: 6c37fc6d am: d3d2e09e

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



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