Mark ab/6881855 as merged am: ca2110ca57 am: 62babe5afc

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/tools/sysprop/+/13113147

Change-Id: I11b17d86593d97f31cec1e01a2c80c763b8b4e18