[automerger skipped] Merge "Implement sysprop_library API stability check" am: 8b4c9376c9 -s ours am: c9f77c9000 -s ours am: eb9f1e88c0 -s ours am: 4deed8e0d0 -s ours
am: f78e840c43 -s ours
am skip reason: change_id I6d69fb418bac675bbb9e4ac25c3269dfa3029219 with SHA1 617a722048 is in history

Change-Id: I0b527c0fd2b803e759671d3ae3aa3a7245711a17