[automerger skipped] Merge "Implement sysprop_library API stability check" am:...

[automerger skipped] Merge "Implement sysprop_library API stability check" am: 8b4c9376 -s ours am: c9f77c90 -s ours am: eb9f1e88 -s ours am: 4deed8e0 -s ours
am: f78e840c -s ours
am skip reason: change_id I6d69fb418bac675bbb9e4ac25c3269dfa3029219 with SHA1 617a7220 is in history

Change-Id: I0b527c0fd2b803e759671d3ae3aa3a7245711a17