Merge "Autogenerate tables of contents" am: 846e9c7f11 am: f4b9980a43

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1833173

Change-Id: I754744182d74d15a7ea0910f0b8a2a342aa60e22